From 0d8993fb240e7572620cdf0cadb4f92e86e02712 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Fri, 26 Feb 2016 21:58:36 +0100 Subject: [PATCH] stack: Don't underallocate the last_child --- gtk/gtkstack.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index fe1d16af1f..882829c574 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -2237,19 +2237,24 @@ gtk_stack_allocate (GtkCssGadget *gadget, child_allocation.x = 0; child_allocation.y = 0; - child_allocation.width = allocation->width; - child_allocation.height = allocation->height; + if (priv->last_visible_child) { int min, nat; - + gtk_widget_get_preferred_width (priv->last_visible_child->widget, &min, &nat); + child_allocation.width = MAX (min, allocation->width); gtk_widget_get_preferred_height_for_width (priv->last_visible_child->widget, - allocation->width, + child_allocation.width, &min, &nat); + child_allocation.height = MAX (min, allocation->height); + gtk_widget_size_allocate (priv->last_visible_child->widget, &child_allocation); } + child_allocation.width = allocation->width; + child_allocation.height = allocation->height; + if (priv->visible_child) { int min, nat; -- 2.30.2